overview: Use a MetaWindow argument in window-drag-* signals/API

It is quite weird to have those calls/signals using WindowClone as an
argument, it is neater to pass MetaWindows around, and have each user
deal with their own representations of these.

https://bugzilla.gnome.org/show_bug.cgi?id=735972

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 3be62bdefa26f891371566b6aa622bed74f1f485..c89fef5d211fd6c5a397aa0e4c211c1567abcebe 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -435,17 +435,17 @@ const Overview = new Lang.Class({
         this._inDrag = false;
     },
 
-    beginWindowDrag: function(clone) {
-        this.emit('window-drag-begin', clone);
+    beginWindowDrag: function(window) {
+        this.emit('window-drag-begin', window);
         this._inDrag = true;
     },
 
-    cancelledWindowDrag: function(clone) {
-        this.emit('window-drag-cancelled', clone);
+    cancelledWindowDrag: function(window) {
+        this.emit('window-drag-cancelled', window);
     },
 
-    endWindowDrag: function(clone) {
-        this.emit('window-drag-end', clone);
+    endWindowDrag: function(window) {
+        this.emit('window-drag-end', window);
         this._inDrag = false;
     },
 

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index cee9ae538d99203d4e2616e7a49bdd45bdcf81a6..07f1b3eb659728fcbaca5b8403c995bd5d66b73b 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1818,16 +1818,16 @@ const Workspace = new Lang.Class({
                       Lang.bind(this, this._onCloneSelected));
         clone.connect('drag-begin',
                       Lang.bind(this, function() {
-                          Main.overview.beginWindowDrag(clone);
+                          Main.overview.beginWindowDrag(clone.metaWindow);
                           overlay.hide();
                       }));
         clone.connect('drag-cancelled',
                       Lang.bind(this, function() {
-                          Main.overview.cancelledWindowDrag(clone);
+                          Main.overview.cancelledWindowDrag(clone.metaWindow);
                       }));
         clone.connect('drag-end',
                       Lang.bind(this, function() {
-                          Main.overview.endWindowDrag(clone);
+                          Main.overview.endWindowDrag(clone.metaWindow);
                           overlay.show();
                       }));
         clone.connect('size-changed',

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 8cd8affc43cac67cd5e2e151fbe95f9918f77372..ea859c7be386c864e4200b5ce18e96cb10345314 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -518,15 +518,15 @@ const WorkspaceThumbnail = new Lang.Class({
                       }));
         clone.connect('drag-begin',
                       Lang.bind(this, function() {
-                          Main.overview.beginWindowDrag(clone);
+                          Main.overview.beginWindowDrag(clone.metaWindow);
                       }));
         clone.connect('drag-cancelled',
                       Lang.bind(this, function() {
-                          Main.overview.cancelledWindowDrag(clone);
+                          Main.overview.cancelledWindowDrag(clone.metaWindow);
                       }));
         clone.connect('drag-end',
                       Lang.bind(this, function() {
-                          Main.overview.endWindowDrag(clone);
+                          Main.overview.endWindowDrag(clone.metaWindow);
                       }));
         this._contents.add_actor(clone.actor);
 

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 9e75661f671c4a0a3eb5cfe68def1504e102a554..ba3a1204f5581f7bbc4fac4dc1f8349bb37f5dc0 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -63,9 +63,9 @@ const WorkspacesViewBase = new Lang.Class({
         }
     },
 
-    _dragBegin: function(overview, clone) {
+    _dragBegin: function(overview, window) {
         this._inDrag = true;
-        this._setReservedSlot(clone.metaWindow);
+        this._setReservedSlot(window);
     },
 
     _dragEnd: function() {